Make geojson writer not crash when there is no URL to write.
authorRobert Lipe <robertlipe@gpsbabel.org>
Thu, 29 Dec 2016 07:15:28 +0000 (02:15 -0500)
committerRobert Lipe <robertlipe@gpsbabel.org>
Thu, 29 Dec 2016 07:15:28 +0000 (02:15 -0500)
geojson.cc

index 5c8fdf491bcdc47abf2b9f86a8c7f346b5b5f7e4..085ae0fad0fd8ef09c4b062f42862b0dfce08fbd 100644 (file)
@@ -74,12 +74,14 @@ geojson_waypt_pr(const Waypoint* waypoint) {
   if (!waypoint->description.isEmpty()) {
     properties["description"] = waypoint->description;
   }
-  UrlLink link = waypoint->GetUrlLink();
-  if (!link.url_.isEmpty()) {
-    properties["url"] = link.url_;
-  }
-  if (!link.url_link_text_.isEmpty()) {
-    properties["urlname"] = link.url_link_text_;
+  if (waypoint->HasUrlLink()) {
+    UrlLink link = waypoint->GetUrlLink();
+    if (!link.url_.isEmpty()) {
+      properties["url"] = link.url_;
+    }
+    if (!link.url_link_text_.isEmpty()) {
+      properties["urlname"] = link.url_link_text_;
+    }
   }
   if (!properties.empty()) {
     object["properties"] = properties;